Merge remote-tracking branch 'origin/feature/asyncOrder' into feature/asyncOrder

# Conflicts:
#	sp-service/async-server/src/main/resources/bootstrap.yml

app.pid

@@ -1 +0,0 @@
-23172

sp-core/sp-nacos/src/main/resources/bootstrap.properties

@@ -1,39 +0,0 @@
-# --------------------- nacos注册中心 --------------------- 
-### nacos注册中心 - 地址
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8001
-### nacos注册中心 - 用户
-spring.cloud.nacos.discovery.username=nacos
-### nacos注册中心 - 密码
-spring.cloud.nacos.discovery.password=nacos
-
-# --------------------- nacos配置中心 --------------------- 
-### nacos配置中心 - 地址 [注册中心地址]
-spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr}
-### nacos配置中心 - 用户 [注册中心用户名]
-spring.cloud.nacos.config.username=${spring.cloud.nacos.discovery.username}
-### nacos配置中心 - 密码 [注册中心用密码]
-spring.cloud.nacos.config.password=${spring.cloud.nacos.discovery.password}
-### 配置文件前缀
-spring.cloud.nacos.config.prefix=${spring.application.name}
-### 配置文件后缀
-spring.cloud.nacos.config.file-extension=yml
-### 共享配置 (实时刷新) 
-spring.cloud.nacos.config.refreshable-dataids=application-common.yml, application-common-${spring.profiles.active}.yml
-
-# --------------------- sentinel-dashboard 控制台 --------------------- 
-# sentinel dashboard 控制台地址 
-spring.cloud.sentinel.transport.dashboard=127.0.0.1:8002
-
-# --------------------- sentinel-dashboard 集成nacos (将配置储存到nacos中) --------------------- 
-### 取消控制台懒加载 
-spring.cloud.sentinel.eager=true
-### nacos地址、用户名、密码等信息 
-spring.cloud.sentinel.datasource.ds.nacos.server-addr=${spring.cloud.nacos.discovery.server-addr}
-spring.cloud.sentinel.datasource.ds.nacos.username=${spring.cloud.nacos.discovery.username}
-spring.cloud.sentinel.datasource.ds.nacos.password=${spring.cloud.nacos.discovery.password}
-spring.cloud.sentinel.datasource.ds.nacos.dataId=${spring.application.name}-sentinel
-spring.cloud.sentinel.datasource.ds.nacos.groupId=DEFAULT_GROUP
-spring.cloud.sentinel.datasource.ds.nacos.data-type=json
-spring.cloud.sentinel.datasource.ds.nacos.rule-type=flow
-
-

sp-native/sp-gateway/src/main/resources/application.yml

@@ -0,0 +1,8 @@
+# 端口
+server:
+    port: 8080
+
+spring:
+    # 当前环境
+    profiles.active: dev
+    

sp-native/sp-gateway/src/main/resources/bootstrap.yml

@@ -1,10 +1,5 @@
-# 端口
-server:
-    port: 8080
-
-spring: 
+spring:
     # 服务名称 
     application.name: sp-gateway
-    # 当前环境
-    profiles.active: dev
+
     

sp-service/async-server/.gitignore

@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/

sp-service/async-server/mvnw.cmd

@@ -1,188 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%

sp-service/async-server/src/main/resources/application.yml

@@ -1 +1,7 @@
 
+# 端口
+server:
+  port: 8068
+spring:
+  # 当前环境
+  profiles.active: dev

sp-service/async-server/src/main/resources/bootstrap.yml

@@ -4,6 +4,6 @@ server:
 
 spring: 
     # 服务名称 
-    application.name: async-server
+    application.name: async-serverw
     # 当前环境
     profiles.active: dev

sp-service/level-one-server/pom.xml

@@ -27,4 +27,5 @@
             <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
+
 </project>

sp-service/level-one-server/src/main/java/com/pj/tb_order/MethodOrderService.java

@@ -56,19 +56,13 @@ public class MethodOrderService {
         if(fk == null)return Collections.emptyList();
         switch (userType){
             case 1: //边民
-                TbPeople tbPeople = tbPeopleMapper.selectById(fk);
-                if(tbPeople == null)throw new ServiceException("当前用户未认证边民!");
-                //根据组进行匹配订单
-                so.put("groupId",tbPeople.getGroupId());
-                so.put("buyUserId",fk);
-                break;
             case 2: //互市组组长
+                TbPeople tbPeople = tbPeopleMapper.selectById(fk);
+                if(tbPeople == null)throw new ServiceException("当前用户未认证!");
                 so.put("buyUserId",fk);
                 break;
             case 5: // 一级市场商家
                 so.put("enterpriseId",fk);
-                //添加未被边民/组长取消条件
-                so.put("cancelPeople",0);
                 break;
             case 6: // 合作社
                 break;

sp-service/level-two-server/.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecord.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * Model: tb_fee_item_record -- 费项订单
+ * Model: tb_fee_item_record -- 收费记录
  * @author yzs 
  */
 @Data
@@ -30,7 +30,7 @@ public class TbFeeItemRecord extends Model<TbFeeItemRecord> implements Serializa
 	/**
 	 * 此模块对应的权限码 
 	 */
-	public static final String PERMISSION_CODE = "tb-fee-item-record-list";
+	public static final String PERMISSION_CODE = "tb-fee-item-record";
 	public static final String PERMISSION_CODE_ADD = "tb-fee-item-record-add";
 	public static final String PERMISSION_CODE_EDIT = "tb-fee-item-record-edit";
 	public static final String PERMISSION_CODE_DEL = "tb-fee-item-record-del";

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordController.java

@@ -14,7 +14,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 
 
 /**
- * Controller: tb_fee_item_record -- 费项订单
+ * Controller: tb_fee_item_record -- 收费记录
  * @author yzs 
  */
 @RestController

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 /**
- * Mapper: tb_fee_item_record -- 费项订单
+ * Mapper: tb_fee_item_record -- 收费记录
  * @author yzs 
  */
 

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordService.java

@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.pj.utils.sg.*;
 
 /**
- * Service: tb_fee_item_record -- 费项订单
+ * Service: tb_fee_item_record -- 收费记录
  * @author yzs 
  */
 @Service

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit_record/TbPeopleProfitRecord.java

@@ -30,7 +30,7 @@ public class TbPeopleProfitRecord extends Model<TbPeopleProfitRecord> implements
 	/**
 	 * 此模块对应的权限码 
 	 */
-	public static final String PERMISSION_CODE = "tb-people-profit-record-list";
+	public static final String PERMISSION_CODE = "tb-people-profit-record";
 	public static final String PERMISSION_CODE_ADD = "tb-people-profit-record-add";
 	public static final String PERMISSION_CODE_EDIT = "tb-people-profit-record-edit";
 	public static final String PERMISSION_CODE_DEL = "tb-people-profit-record-del";

sp-service/level-two-server/src/main/resources/application.yml

@@ -0,0 +1,8 @@
+# 端口
+server:
+    port: 8012
+
+spring:
+    # 当前环境
+    profiles.active: dev
+    

sp-service/level-two-server/src/main/resources/bootstrap.yml

@@ -1,5 +1,3 @@
 spring:
   # ????
   application.name: level-two-server
-  # ????
-  profiles.active: dev

sp-service/pom.xml

@@ -23,23 +23,24 @@
 
 	<!-- 构建配置 -->
     <build>
+        <finalName>${project.name}</finalName>
         <plugins>
             <!-- 打包jar文件时，可配置manifest文件，加入lib包的jar依赖 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-<!--                <configuration>-->
-<!--                    <source>${java.version}</source>-->
-<!--                    <target>${java.version}</target>-->
-<!--                    <encoding>${project.build.sourceEncoding}</encoding>-->
-<!--                    <archive>-->
-<!--                        <manifest>-->
-<!--                            <addClasspath>true</addClasspath>-->
-<!--                            <classpathPrefix>lib/</classpathPrefix>-->
-<!--                           	<mainClass>${java.run.main.class}</mainClass>-->
-<!--                        </manifest>-->
-<!--                    </archive>-->
-<!--                </configuration>-->
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                           	<mainClass>${java.run.main.class}</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
             <!-- 拷贝依赖的jar包到lib目录 -->
             <plugin>

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUser.java

@@ -123,9 +123,14 @@ public class AppUser extends Model<AppUser> implements Serializable {
 	 */
 	private String password;
 
+	/**
+	 * 边民是否首次使用APP人脸认证(0=未认证,1=已认证);
+	 */
+	private Integer face;
 
-
-	
-
+	/**
+	 * 验证时间
+	 */
+	private Date faceTime;
 
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -11,6 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * app_user -- 移动端账号(只针对app端使用)
@@ -42,10 +46,24 @@ public class AppUserApiController {
         return AjaxJson.getSuccessData(a);
     }
 
-    /** 获取审核状态 */
+    /** 获取认证状态 */
     @RequestMapping("getAuth")
     public AjaxJson getAuth(){
-        return AjaxJson.getSuccessData(appUserService.getById(StpAPPUserUtil.getAPPLoginInfo().getLoginId()).getAuth());
+        AppUser user=appUserService.getById(StpAPPUserUtil.getAPPLoginInfo().getLoginId());
+        Map so=new HashMap();
+        so.put("auth",user.getAuth());
+        so.put("face",user.getFace());
+        return AjaxJson.getSuccessData(so);
+    }
+
+    /** 边民首次使用APP人脸认证 */
+    @PostMapping("face")
+    public AjaxJson face(){
+        AppUser user=new AppUser();
+        user.setId(StpAPPUserUtil.getAPPLoginInfo().getLoginId());
+        user.setFace(1);
+        user.setFaceTime(new Date());
+        return AjaxJson.toAjax(appUserService.updateById(user));
     }
 
 

sp-service/sp-admin/src/main/resources/application.yml

@@ -0,0 +1,8 @@
+# 端口
+server:
+    port: 8011
+
+spring: 
+    # 当前环境
+    profiles.active: debug
+

sp-service/sp-admin/src/main/resources/bootstrap.yml

@@ -1,10 +1,4 @@
-# 端口
-server:
-    port: 8011
-
-spring: 
-    # 服务名称 
+spring:
+    # 服务名称
     application.name: sp-admin
-    # 当前环境
-    profiles.active: dev
 

sp-service/transport-server/.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar