定时器

travel/admin/src/main/java/com/lc/admin/AdminApplication.java

@@ -5,10 +5,12 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @MapperScan({"com.cl.mbg.mapper", "com.lc.dao"})
-@ComponentScan({"com.lc.service", "com.lc.admin.controller"})
+@ComponentScan({"com.lc.service", "com.lc.admin"})
+@EnableScheduling
 public class AdminApplication {
 
     public static void main(String[] args) {

travel/admin/src/main/java/com/lc/admin/controller/SetmealController.java

@@ -7,8 +7,10 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.OSSException;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.aliyun.oss.model.PutObjectResult;
+import com.cl.mbg.model.TSetmeal;
 import com.lc.common.pojo.TravelParams;
 import com.lc.common.utils.Result;
+import com.lc.service.RedisService;
 import com.lc.service.SetmealService;
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Response;
@@ -39,44 +41,39 @@ public class SetmealController {
     @Value("${setmeal.upload.alioss.bucketName}")
     private String bucketName;
 
+    @Value("${setmeal.upload.imageprefix}")
+    private String uploadImagePrefix;
+
+    @Resource
+    RedisService redisService;
+
     @Resource
     SetmealService setmealService;
 
+    @PostMapping("/add.do")
+    public Result add(@RequestBody TSetmeal setmeal, @RequestParam Integer[] travelgroupIds){
+        int i = setmealService.add( setmeal, travelgroupIds );
+        return Result.ok();
+    }
+
     @PostMapping("/findPage.do")
     public Result findPage( @RequestBody TravelParams travelParams ){
         return Result.data( setmealService.findPage( travelParams ) );
     }
 
-    @PostMapping("/upload.do")
-    public Result upload(MultipartFile imgFile){
-        String originalFilename = imgFile.getOriginalFilename();
-//        Configuration cfg = new Configuration(Region.region1());
-//        cfg.resumableUploadAPIVersion = Configuration.ResumableUploadAPIVersion.V2;
-//        UploadManager uploadManager = new UploadManager(cfg);
-//        String accessKey = "79OD2IOqm6PCJsrhbfzWlJUP2ol3m6TZCtdcAR7X";
-//        String secretKey = "Yyr3kyBUk88mbG5CgVv2P6Pyz5Xwi9Vl3GjciUQL";
-//        String bucket = "file-static";
-//        String key = originalFilename;
-//        Auth auth = Auth.create(accessKey, secretKey);
-//        String upToken = auth.uploadToken(bucket);
-//        try {
-//            Response response = uploadManager.put( imgFile.getBytes() , key, upToken);
-//            //解析上传成功的结果
-//            DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class);
-//            System.out.println(putRet.key);
-//            System.out.println(putRet.hash);
-//        } catch (QiniuException ex) {
-//            Response r = ex.response;
-//            System.err.println(r.toString());
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        return Result.data( key );
+    @GetMapping("/delete.do")
+    public Result delete( @RequestParam int id ){
+        setmealService.delete(id);
+        return Result.ok();
+    }
 
+    @PostMapping("/upload.do")
+    public Result upload(MultipartFile file){
+        String originalFilename = file.getOriginalFilename();
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         try {
             PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName,
-                    originalFilename, imgFile.getInputStream() );
+                    originalFilename, file.getInputStream() );
             PutObjectResult result = ossClient.putObject(putObjectRequest);
         } catch (OSSException oe) {
             System.out.println( oe.getMessage() );
@@ -89,7 +86,37 @@ public class SetmealController {
                 ossClient.shutdown();
             }
         }
+        //把图片暂时存储在 Redis 中
+        redisService.lPush(uploadImagePrefix, originalFilename);
         return Result.data(originalFilename);
     }
 
+    @PostMapping("/qnUpload.do")
+    public Result qnUpload(MultipartFile file) {
+        String originalFilename = file.getOriginalFilename();
+        Configuration cfg = new Configuration(Region.region1());
+        cfg.resumableUploadAPIVersion = Configuration.ResumableUploadAPIVersion.V2;
+        UploadManager uploadManager = new UploadManager(cfg);
+        String accessKey = "79OD2IOqm6PCJsrhbfzWlJUP2ol3m6TZCtdcAR7X";
+        String secretKey = "Yyr3kyBUk88mbG5CgVv2P6Pyz5Xwi9Vl3GjciUQL";
+        String bucket = "file-static";
+        String key = originalFilename;
+        Auth auth = Auth.create(accessKey, secretKey);
+        String upToken = auth.uploadToken(bucket);
+        try {
+            Response response = uploadManager.put( file.getBytes() , key, upToken);
+            //解析上传成功的结果
+            DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class);
+            System.out.println(putRet.key);
+            System.out.println(putRet.hash);
+        } catch (QiniuException ex) {
+            Response r = ex.response;
+            System.err.println(r.toString());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return Result.data( key );
+    }
+
+
 }

travel/admin/src/main/java/com/lc/admin/controller/TravelGroupController.java

@@ -39,6 +39,14 @@ public class TravelGroupController {
         return Result.data( travelGroupService.findPage(travelParams) );
     }
 
+    @GetMapping("/findAll.do")
+    public Result findAll(){
+
+        return  Result.data(
+                travelGroupService.findAll()
+        );
+    }
+
     @GetMapping("/delete.do")
     public Result delete(int id){
         int i = travelGroupService.deleteById(id);

travel/admin/src/main/resources/application.properties

@@ -13,4 +13,11 @@ spring.servlet.multipart.max-file-size=10MB
 setmeal.upload.alioss.endpoint=https://oss-cn-beijing.aliyuncs.com
 setmeal.upload.alioss.accessKeyId=Z75YxVNFPfXK48zg
 setmeal.upload.alioss.accessKeySecret=DC5nkj1XSWwzqmuHQ8SIQByrgUm13q
-setmeal.upload.alioss.bucketName=80boys-beijing
+setmeal.upload.alioss.bucketName=80boys-beijing
+setmeal.upload.imageprefix=setmeal.upload.imageprefix
+
+spring.redis.database=9
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+

travel/admin/src/main/resources/templates/setmeal.html

@@ -96,7 +96,7 @@
                         <el-table-column label="操作" align="center">
                             <template slot-scope="scope">
                                 <el-button type="primary" size="mini">编辑</el-button>
-                                <el-button size="mini" type="danger">删除</el-button>
+                                <el-button size="mini"  @click="handleDelete(scope.row)" type="danger">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -160,14 +160,12 @@
                                             <el-row>
                                                 <el-col :span="24">
                                                     <el-form-item label="上传图片">
-                                                        <!--   action="/setmeal/upload.do" -->
                                                         <el-upload
                                                                 class="avatar-uploader"
-                                                                action="http://39.105.160.25:11002/file/upload"
+                                                                action="/setmeal/upload.do"
                                                                 :auto-upload="autoUpload"
                                                                 name="file"
                                                                 :show-file-list="false"
-                                                                :headers="myheader"
                                                                 :on-success="handleAvatarSuccess"
                                                                 :before-upload="beforeAvatarUpload">
                                                             <img v-if="imageUrl" :src="imageUrl" class="avatar">
@@ -233,16 +231,13 @@
         var vue = new Vue({
             el: '#app',
             data:{
-                myheader:{
-                    Token: "112334",
-                },
                 autoUpload:true,//自动上传
                 imageUrl:null,//模型数据，用于上传图片完成后图片预览
                 activeName:'first',//添加/编辑窗口Tab标签名称
                 pagination: {//分页相关属性
                     currentPage: 1,
                     pageSize:10,
-                    total:100,
+                    total:0,
                     queryString:{
                         name:""
                     },
@@ -261,8 +256,8 @@
                 handleAvatarSuccess(response, file) {
 									//对imageUrl 赋值 在文件框中显示
 									//this.imageUrl = `http://ra5vj2ycp.hn-bkt.clouddn.com/${response.data}`
-									//this.imageUrl = `https://80boys-beijing.oss-cn-beijing.aliyuncs.com/${response.data}`
-									this.imageUrl = response.data
+									this.imageUrl = `https://80boys-beijing.oss-cn-beijing.aliyuncs.com/${response.data}`
+									//this.imageUrl = response.data
 									this.$message({
 										message : response.message,
 										type : response.flag ? 'success' : 'error'
@@ -335,6 +330,40 @@
                 handleCurrentChange(currentPage) {
 									this.pagination.currentPage = currentPage
 									this.findPage()
+                },
+                // 删除
+                handleDelete(row) {
+                    this.$confirm('此操作将永久删除该自由行, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                        center: true
+                    }).then(() => {
+                        // 发送ajax请求，执行删除
+                        axios.get(`/setmeal/delete.do?id=${row.id}`)
+                            .then( res =>{
+                                console.log(res)
+                                if(res.data.flag){
+                                    this.$message({
+                                        type: 'success',
+                                        message: res.data.message
+                                    });
+                                    //刷新页面
+                                    this.findPage();
+                                }else{
+                                    this.$message({
+                                        type: 'error',
+                                        message: res.data.message
+                                    });
+                                }
+                            })
+
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
                 }
             }
         })

travel/jobs/.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

travel/jobs/mvnw

@@ -1,316 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# 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.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`\\unset -f command; \\command -v java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
-
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

travel/jobs/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%

travel/jobs/pom.xml

@@ -3,31 +3,22 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.12</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.cl.travel</groupId>
+        <artifactId>travel</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     <groupId>com.lc</groupId>
     <artifactId>jobs</artifactId>
     <version>0.0.1-SNAPSHOT</version>
+
     <name>jobs</name>
     <description>jobs</description>
+
+    <packaging>pom</packaging>
+
     <properties>
         <java.version>1.8</java.version>
     </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 
     <build>
         <plugins>

travel/jobs/src/main/java/com/lc/jobs/JobsApplication.java

@@ -1,13 +0,0 @@
-package com.lc.jobs;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class JobsApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(JobsApplication.class, args);
-    }
-
-}

travel/jobs/src/main/resources/application.properties

@@ -1 +0,0 @@
-

travel/jobs/src/test/java/com/lc/jobs/JobsApplicationTests.java

@@ -1,13 +0,0 @@
-package com.lc.jobs;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class JobsApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

travel/pom.xml

@@ -34,6 +34,32 @@
         <oss.version>3.8.0</oss.version>
         <mybatis.version>2.2.0</mybatis.version>
         <mybatis-genertator.version>1.4.0</mybatis-genertator.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.test.skip>true</maven.test.skip>
+
+        <netty.version>4.1.90.Final</netty.version>
+        <gson.version>2.10.1</gson.version>
+
+        <spring.version>5.3.26</spring.version>
+        <spring-boot.version>2.7.9</spring-boot.version>
+
+        <mybatis-spring-boot-starter.version>2.3.0</mybatis-spring-boot-starter.version>
+        <mysql-connector-j.version>8.0.32</mysql-connector-j.version>
+
+        <slf4j-api.version>1.7.36</slf4j-api.version>
+        <junit-jupiter.version>5.9.2</junit-jupiter.version>
+        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
+
+        <groovy.version>4.0.10</groovy.version>
+
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+
     </properties>
 
     <dependencies>
@@ -89,6 +115,15 @@
             <version>[7.7.0, 7.10.99]</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
 
     </dependencies>
 

travel/service/src/main/java/com/lc/service/SetmealService.java

@@ -1,5 +1,6 @@
 package com.lc.service;
 
+import com.cl.mbg.model.TSetmeal;
 import com.lc.common.pojo.TravelParams;
 
 import java.util.HashMap;
@@ -8,4 +9,7 @@ public interface SetmealService {
 
     HashMap<String, Object> findPage(TravelParams travelParams);
 
+    int add(TSetmeal setmeal, Integer[] travelgroupIds);
+
+    int delete(int id);
 }

travel/service/src/main/java/com/lc/service/TravelGroupService.java

@@ -5,6 +5,7 @@ import com.lc.common.pojo.TravelParams;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 public interface TravelGroupService {
 
@@ -19,4 +20,6 @@ public interface TravelGroupService {
     int add(TTravelgroup travelgroup, Integer[] travelItemIds);
 
     ArrayList<Integer> selectTravelItemByGroupId(int id);
+
+    List<TTravelgroup> findAll();
 }

travel/service/src/main/java/com/lc/service/impl/SetmealServiceImpl.java

@@ -1,8 +1,11 @@
 package com.lc.service.impl;
 
 import com.cl.mbg.mapper.TSetmealMapper;
+import com.cl.mbg.mapper.TSetmealTravelgroupMapper;
 import com.cl.mbg.model.TSetmeal;
 import com.cl.mbg.model.TSetmealExample;
+import com.cl.mbg.model.TSetmealTravelgroup;
+import com.cl.mbg.model.TSetmealTravelgroupExample;
 import com.github.pagehelper.PageHelper;
 import com.lc.common.pojo.TravelParams;
 import com.lc.service.SetmealService;
@@ -19,6 +22,9 @@ public class SetmealServiceImpl implements SetmealService {
     @Resource
     TSetmealMapper setmealMapper;
 
+    @Resource
+    TSetmealTravelgroupMapper setmealTravelgroupMapper;
+
     @Override
     public HashMap<String, Object> findPage(TravelParams travelParams) {
         PageHelper.startPage( travelParams.getCurrentPage(), travelParams.getPageSize() );
@@ -36,4 +42,28 @@ public class SetmealServiceImpl implements SetmealService {
         ret.put("total", count);
         return ret;
     }
+
+    @Override
+    public int add(TSetmeal setmeal, Integer[] travelgroupIds) {
+        int insert = setmealMapper.insert(setmeal);
+        if ( travelgroupIds != null && travelgroupIds.length > 1 ) {
+            for ( int i : travelgroupIds ) {
+                TSetmealTravelgroup tSetmealTravelgroup = new TSetmealTravelgroup();
+                tSetmealTravelgroup.setSetmealId(setmeal.getId());
+                tSetmealTravelgroup.setTravelgroupId( i );
+                setmealTravelgroupMapper.insert(tSetmealTravelgroup);
+            }
+        }
+        return insert;
+    }
+
+    @Override
+    public int delete(int id) {
+        int i = setmealMapper.deleteByPrimaryKey(id);
+        TSetmealTravelgroupExample tSetmealTravelgroupExample = new TSetmealTravelgroupExample();
+        TSetmealTravelgroupExample.Criteria criteria = tSetmealTravelgroupExample.createCriteria();
+        criteria.andSetmealIdEqualTo(id);
+        setmealTravelgroupMapper.deleteByExample(tSetmealTravelgroupExample);
+        return i;
+    }
 }

travel/service/src/main/java/com/lc/service/impl/TravelGroupServiceImpl.java

@@ -113,4 +113,9 @@ public class TravelGroupServiceImpl implements TravelGroupService {
         }
         return objects;
     }
+
+    @Override
+    public List<TTravelgroup> findAll() {
+        return tTravelGroupMapper.selectByExample(null);
+    }
 }