Bladeren bron

日常修改

Administrator 2 jaren geleden
bovenliggende
commit
0ef201d1b8
9 gewijzigde bestanden met toevoegingen van 24 en 9 verwijderingen
  1. 3 3
      configs/config.go
  2. 2 1
      data/dao/OrderDao.go
  3. BIN
      demo
  4. BIN
      file.zip
  5. 10 0
      file/buildGo.bat
  6. 5 2
      file/saveSql.bat
  7. 1 0
      file/upload.bat
  8. 1 1
      main.go
  9. 2 2
      router/FileRouter.go

+ 3 - 3
configs/config.go

@@ -62,9 +62,9 @@ func ConfigInit() {
 	}
 	config := viper.New()
 
-	config.AddConfigPath(path + "\\configs") //设置读取的文件路径
-	config.SetConfigName("config")           //设置读取的文件名
-	config.SetConfigType("yaml")             //设置文件的类型
+	config.AddConfigPath(path + "/configs") //设置读取的文件路径
+	config.SetConfigName("config")          //设置读取的文件名
+	config.SetConfigType("yaml")            //设置文件的类型
 	//尝试进行配置读取
 	if err := config.ReadInConfig(); err != nil {
 		panic(err)

+ 2 - 1
data/dao/OrderDao.go

@@ -70,7 +70,8 @@ func GetUserCouponByUserId(userId int) ([]domain.CouponUserJDM, error) {
 	var couponUserJDMs []domain.CouponUserJDM
 	err := configs.Engine.Table("goods_coupon_user").
 		Join("INNER", "goods_coupon", "goods_coupon_user.coupon_id = goods_coupon.id").
-		Where("goods_coupon_user.user_id = ?", userId).Find(&couponUserJDMs)
+		Where("goods_coupon_user.user_id = ?", userId).
+		Find(&couponUserJDMs)
 	if err != nil {
 		return couponUserJDMs, err
 	}


BIN
file.zip


+ 10 - 0
file/buildGo.bat

@@ -0,0 +1,10 @@
+@ECHO off
+cd ..
+echo %~dp0
+echo %cd%
+set GOARCH=amd64
+go env -w GOARCH=amd64
+set GOOS=linux
+go env -w GOOS=linux
+go build
+@ECHO on

+ 5 - 2
file/saveSql.bat

@@ -1,9 +1,12 @@
 @ECHO off
 chcp 65001
 echo 启动sql控制脚本
+
 echo "1| 保存sql   2| 运行sql覆盖数据库"
 
+
 set /p var="请输入控制指令 :"
+echo  %~dp0
 C:
 cd C:\Program Files\MySQL\MySQL Server 5.7\bin\
 SET dbhost=127.0.0.1
@@ -16,10 +19,10 @@ echo "code %var%"
 
 if %var% == 1 (
 echo [%time%] [保存sql]
-mysqldump -h%dbhost% -u%dbuser% -p%dbpasswd% %dbName% > E:\project\kkc\kkc-go\file\virtual_mall.sql
+mysqldump -h%dbhost% -u%dbuser% -p%dbpasswd% %dbName% > %~dp0\virtual_mall.sql
 ) else if %var% == 2 (
 echo [%time%] [运行sql]
-mysql -h%dbhost% -u%dbuser% -p%dbpasswd% %dbName% < E:\project\kkc\kkc-go\file\virtual_mall.sql
+mysql -h%dbhost% -u%dbuser% -p%dbpasswd% %dbName% < %~dp0\virtual_mall.sql
 ) else (
 echo "运行错误 未知代码:%var%"
 )

+ 1 - 0
file/upload.bat

@@ -0,0 +1 @@
+scp -r ../demo ubuntu@119.91.65.232:/opt/outsource/kkc-go

+ 1 - 1
main.go

@@ -25,5 +25,5 @@ func runGin() {
 	apiGroup.GET("/ping", share.JwtMiddleware(), func(context *gin.Context) {
 		context.String(200, "pong")
 	})
-	Router.Run()
+	Router.Run(":8182")
 }

+ 2 - 2
router/FileRouter.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	uploadFileKey = "upload-key"
+	uploadFileKey = "upload.bat-key"
 	filepath      = "./file/resources/"
 )
 
@@ -18,7 +18,7 @@ func FileRouter(engine *gin.RouterGroup) {
 	engine.StaticFS("/static", http.Dir("file/resources"))
 	user := engine.Group("/file")
 	{
-		user.POST("/upload", uploadHandler)
+		user.POST("/upload.bat", uploadHandler)
 	}
 }