Merge branch 'master' of http://git.ycjcjy.com/pet_identity/service

deploy/backup.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+#
+
+source /etc/profile
+
+#
+BackupDir=/opt/apps/mysqlbackup
+fmonth=`date "+%Y%m"`
+fdate=`date "+%Y%m%d%H%M%S"`
+logfile=$BackupDir/backmysql.log
+chown -R mysql:mysql $BackupDir
+chmod -R 775 $BackupDir
+
+# 备份
+function backupPetIdentity () {
+  echo "`date "+%m %d %H:%M:%S"` Begin backup pet_identity database" >> $logfile
+
+  if [ ! -d $BackupDir/$fmonth ];then
+    mkdir -p $BackupDir/$fmonth
+  fi
+
+  chown -R mysql:mysql $BackupDir/$fmonth
+  cd $BackupDir/$fmonth
+
+  mysqldump -R -E pet_identity > pet_identity_$fdate.sql
+
+  echo "`date "+%m %d %H:%M:%S"` Begin compress database " >> $logfile
+  tar -cf pet_identity_$fdate.sql.tar pet_identity_$fdate.sql
+  rm -f pet_identity_$fdate.sql
+  echo "`date "+%m %d %H:%M:%S"` data compress done" >> $logfile
+
+  echo "`date "+%m %d %H:%M:%S"` backup pet_identity database done" >> $logfile
+  echo "`date "+%m %d %H:%M:%S"` backup file $BackupDir/$fmonth/pet_identity_$fdate.sql.tar" >> $logfile
+}
+
+backupPetIdentity
+echo "mysql数据库备份完成"

deploy/bootstrap

@@ -1,5 +0,0 @@
-#!/bin/bash
-#
-#
-
-java -jar ./ubpa-0.0.7.jar

deploy/s.yml

@@ -1,35 +0,0 @@
-edition: 1.0.0          #  命令行YAML规范版本，遵循语义化版本（Semantic Versioning）规范。
-name: ubpa-plat        #  项目名称。
-access: default         #  密钥别名。
-
-services:
-  dianyang: #  服务名称。
-    component: devsapp/fc
-    props: #  组件的属性值。
-      region: cn-shanghai
-      service:
-        name: ubpa-plat
-        description: 'ubpa-plat'
-        internetAccess: true
-      function:
-        name: ubpa-func
-        description: 'ubpa-func'
-        ossBucket: yz-serverless
-        ossKey: ubpa/ubpa-0.0.7.zip
-        handler: 'com.njyunzhi.ubpa.UbpaApplication::main'
-        memorySize: 1024
-        timeout: 30
-        runtime: custom
-        caPort: 9000
-        initializationTimeout: 30
-        instanceConcurrency: 10
-      triggers:
-        - name: httpUbpa
-          type: http
-          config:
-            authType: anonymous
-            methods:
-              - GET
-              - POST
-              - PUT
-              - DELETE

deploy/start.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+#
+#source /etc/profile
+
+JAVA_HOME=/opt/apps/jdk1.8.0_331
+JRE_HOME=$JAVA_HOME/jre
+PATH=$PATH:$JAVA_HOME/bin
+CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
+export JAVA_HOME
+export JRE_HOME
+export PATH
+export CLASSPATH
+
+SERVICE_HOME="/opt/apps/pet-identity/service"
+LOG="$SERVICE_HOME/logs/service.log"
+JAR=$(ls -lt ${SERVICE_HOME}/*.jar|head -n1|rev|cut -d" " -f1|rev)
+LIBS="$SERVICE_HOME/libs"
+CONFIG_PATH="$SERVICE_HOME/config/"
+
+nohup java -Dloader.path=$LIBS -jar $JAR --spring.config.location=$CONFIG_PATH > $LOG 2>&1 &
+
+tail -f $LOG
+

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.njyunzhi</groupId>
 	<artifactId>pet_identity</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.4</version>
 	<name>pet_identity</name>
 	<description>Demo project for Spring Boot</description>
 

src/main/java/com/njyunzhi/pet_identity/controller/TaApplicationController.java

@@ -84,7 +84,8 @@ public class TaApplicationController extends BaseController {
                                           @ApiParam("犬名") @RequestParam(value ="petName", required = false) String petName,
                                           @ApiParam("卡号") @RequestParam(value ="originCardNo", required = false) String originCardNo,
                                           @ApiParam("是否企业") @RequestParam(value ="isOrg", required = false) Boolean isOrg,
-                                          @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName) throws Exception{
+                                          @ApiParam("企业名称") @RequestParam(value ="orgName", required = false) String orgName,
+                                          @ApiParam("状态") @RequestParam(value ="status", required = false) Integer status) throws Exception{
 
         SysUser sysUser = currentUser();
 
@@ -93,6 +94,7 @@ public class TaApplicationController extends BaseController {
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.eq(!StringUtils.isEmpty(applyType), "apply_type", applyType);
         queryWrapper.eq(null != applyMethod, "apply_method", applyMethod);
+        queryWrapper.eq(null != status, "status", status);
         queryWrapper.eq(null != payStatus, "pay_status", payStatus);
         queryWrapper.eq(null != verifyStatus, "verify_status", verifyStatus);
         queryWrapper.eq(null != isOrg, "is_org", isOrg);

src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
   datasource:
-    url: jdbc:mysql://110.40.183.156:3306/pet_identity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://localhost:3306/pet_identity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: pet_identity
     password: pet@ABCD1234
 

src/main/resources/application.yml

@@ -72,13 +72,13 @@ aliyun:
 ###
 weixin:
   miniapp:
-    appid: wxe44244d1a5ea3364
-    secret: b7dbbb7b51d40aa716115e76721ed3ff
+    appid: wx0e3d36f7447d9868
+    secret: 68b4be08314cf352575e6ef69f0f109d
     token:
     aesKey:
     msgDataFormat: JSON
   pay:
-    appId: wxe44244d1a5ea3364
+    appId: wx0e3d36f7447d9868
     mchId: 1621038483
     mchKey: #????
     subAppId: #??????????????ID