hoteas/iedc-go
1
0
Fork 0
forked from golang/hotime
Code Issues Pull Requests Projects Releases Wiki Activity

增加跨域配置，以及增加配置说明

Browse Source
This commit is contained in:
hoteas 2020-02-20 14:20:56 +08:00
parent 9070bd2fe7
commit 0f29b3304e
23 changed files with 255 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
application.go
View File

@ -221,25 +221,31 @@ func (this *Application) SetConfig(configPath ...string) {
//文件如果损坏则不写入配置防止配置文件数据丢失
if this.Error.GetError() == nil {
var out bytes.Buffer
var configByte bytes.Buffer
err = json.Indent(&out, []byte(this.Config.ToJsonString()), "", "\t")
err = json.Indent(&configByte, []byte(this.Config.ToJsonString()), "", "\t")
//判断配置文件是否序列有变化有则修改配置，五则不变
//fmt.Println(len(btes))
if len(btes) != 0 && out.String() == string(btes) {
if len(btes) != 0 && configByte.String() == string(btes) {
return
}
err = ioutil.WriteFile(this.configPath, out.Bytes(), os.ModeAppend)
//写入配置说明
var configNoteByte bytes.Buffer
json.Indent(&configNoteByte, []byte(ConfigNote.ToJsonString()), "", "\t")
ioutil.WriteFile(filepath.Dir(this.configPath)+"/confignote.json", configNoteByte.Bytes(), os.ModeAppend)
//写入配置
err = ioutil.WriteFile(this.configPath, configByte.Bytes(), os.ModeAppend)
if err != nil {
os.MkdirAll(filepath.Dir(this.configPath), os.ModeDir)
os.Create(this.configPath)
err = ioutil.WriteFile(this.configPath, out.Bytes(), os.ModeAppend)
err = ioutil.WriteFile(this.configPath, configByte.Bytes(), os.ModeAppend)
if err != nil {
this.Error.SetError(err)
}
//写入配置说明
os.Create(filepath.Dir(this.configPath) + "/confignote.json")
ioutil.WriteFile(filepath.Dir(this.configPath)+"/confignote.json", configNoteByte.Bytes(), os.ModeAppend)
}
}
@ -322,6 +328,8 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
//url去掉参数并序列化
context.HandlerStr, context.RouterString = this.urlSer(context.HandlerStr)
//跨域设置
CrossDomain(&context)
//访问拦截true继续false暂停
connectListenerLen := len(this.connectListener)
if connectListenerLen != 0 {
@ -402,3 +410,46 @@ func (this *Application) handler(w http.ResponseWriter, req *http.Request) {
http.ServeFile(w, req, path)
}
func CrossDomain(this *Context) {
//没有跨域设置
if this.Config.GetString("crossDomain") == "" {
return
}
header := this.Resp.Header()
header.Set("Access-Control-Allow-Origin", "*")
header.Set("Access-Control-Allow-Methods", "*")
header.Set("Access-Control-Allow-Credentials", "true")
header.Set("Access-Control-Expose-Headers", "*")
header.Set("Access-Control-Allow-Headers", "X-Requested-With,Content-Type,Access-Token")
if this.Config.GetString("crossDomain") != "*" {
header.Set("Access-Control-Allow-Origin", this.Config.GetString("crossDomain"))
return
}
origin := this.Req.Header.Get("Origin")
if origin != "" {
header.Set("Access-Control-Allow-Origin", origin)
return
}
refer := this.Req.Header.Get("Referer")
if refer != "" {
tempInt := 0
lastInt := strings.IndexFunc(refer, func(r rune) bool {
if r == '/' && tempInt > 8 {
return true
}
tempInt++
return false
})
if lastInt < 0 {
lastInt = len(refer)
}
refer = Substr(refer, 0, lastInt)
header.Set("Access-Control-Allow-Origin", refer)
}
}

4
cache/cache_redis.go vendored
View File

@ -1,10 +1,10 @@
package cache
import (
"time"
"github.com/garyburd/redigo/redis"
. "go.hoteas.com/hotime"
"strings"
"time"
)
type CacheRedis struct {
@ -83,7 +83,6 @@ func (this *CacheRedis) set(key string, value string, time int64) {
}
}
func (this *CacheRedis) get(key string) *Obj {
reData := &Obj{}
var err error
@ -147,7 +146,6 @@ func (this *CacheRedis) Cache(key string, data ...interface{}) *Obj {
}
}
this.set(key, ObjToStr(data[0]), tim)
return reData

1
cache_memory.go
View File

@ -71,7 +71,6 @@ func (this *CacheMemory) set(key string, value interface{}, time int64) {
data.time = time
data.data = value
this.Map.Put(key, data)
}

1
const.go
View File

@ -5,5 +5,6 @@ const (
LOG_NIL = 1
LOG_FILE = 2
)
//session储存头
const HEAD_SESSION_ADD = "session#"

1
context.go
View File

@ -20,7 +20,6 @@ type Context struct {
HandlerStr string //复写请求url
}
//唯一标志
func (this *Context) Mtd(router [3]string) Map {
this.Application.Router[router[0]][router[1]][router[2]](this)

2
dri/ddsms/ddsms.go
View File

@ -56,8 +56,6 @@ func (this *DDY) send(mUrl string, umoblie string, content string) (bool, error)
return false, errors.New("连接错误")
}
var msg interface{}
err1 := json.Unmarshal([]byte(res), &msg)
if err1 != nil {

6
dri/upload/upload.go
View File

@ -26,7 +26,7 @@ func (this *Upload) UpFile(Request *http.Request, fieldName, savefilepath, saveP
fieldName = k
file, _, err = Request.FormFile(fieldName)
if err != nil {
return "", errors.New("上传头像失败")
return "", errors.New("上传文件失败")
}
}
@ -58,12 +58,12 @@ func (this *Upload) UpFile(Request *http.Request, fieldName, savefilepath, saveP
header, err := os.OpenFile(filePath, os.O_CREATE, 0666)
if err != nil {
return "", errors.New("服务器创建头像文件失败")
return "", errors.New("服务器创建文件失败")
}
_, err = io.Copy(header, file)
if err != nil {
return "", errors.New("服务器复制头像文件失败")
return "", errors.New("服务器复制文件失败")
}
return filePath, nil

2
error.go
View File

@ -2,7 +2,6 @@ package hotime
import (
"log"
)
//框架层处理错误
@ -18,7 +17,6 @@ func(this *Error)GetError()error{
func (this *Error) SetError(err error, loglevel ...int) {
this.err = nil
if err == nil {
this.err = err

33
example/config/confignote.json Normal file
View File

@ -0,0 +1,33 @@
{
"cacheLongTime": "两级缓存，长缓存存储时间60 * 60 * 24 * 30，一般为数据库或者redis缓存",
"cacheShortTime": "两级缓存，短缓存存储时间60 * 60 * 2，一般为内存缓存",
"crossDomain": "跨域设置，空字符串为不开启，*为开启所有网站允许跨域，http://www.baidu.com为指定域允许跨域",
"dbCached": "是否开启数据库缓存0为关闭，其他开启",
"dbHost": "数据库ip地址默认127.0.0.1",
"dbName": "数据库名称，sqlite为文件路径比如a/x.db",
"dbPort": "数据库端口",
"dbPwd": "数据库密码",
"dbType": "如果使用自动数据库配置，请设置此项，手动配置数据库不需要，目前支持mysql，sqlite",
"dbUser": "数据库用户名",
"debug": "是否开启debug模式，0关闭，其他开启，debug模式下日志展示更全",
"defFile": "默认访问文件，默认访问index.html或者index.htm文件",
"error": {
"1": "内部系统异常，在环境配置，文件访问权限等基础运行环境条件不足造成严重错误时使用",
"2": "访问权限异常，没有登录或者登录异常等时候使用",
"3": "请求参数异常，request参数不满足要求，比如参数不足，参数类型错误，参数不满足要求等时候使用",
"4": "数据处理异常,数据库操作或者三方请求返回的结果非正常结果，比如数据库突然中断等时候使用",
"5": "数据结果异常，一般用于无法给出response要求的格式要求下使用，比如response需要的是string格式但你只能提供int数据时",
"注释": "web服务内置错误提示，自定义异常建议10开始"
},
"logLevel": "日志等级，0打印，1关闭，2，记录到文件",
"modeRouterStrict": "路由严格模式false,为大小写忽略必须匹配，true必须大小写匹配",
"port": "web服务开启Http端口，0为不启用http服务",
"redisHost": "需要使用redis服务时配置，默认服务ip：127.0.0.1",
"redisPort": "需要使用redis服务时配置，默认服务端口：6379",
"redisPwd": "需要使用redis服务时配置，默认服务密码：123456",
"sessionName": "设置session的cookie名默认HOTIME",
"tlsCert": "https证书",
"tlsKey": "https密钥",
"tlsPort": "web服务https端口，0为不启用https服务",
"tpt": "静态文件目录，默认为程序目录下tpt目录"
}

9
example/main.go
View File

@ -2,10 +2,9 @@ package main
import (
"code.hoteas.com/hoteas/hotime"
"code.hoteas.com/hoteas/hotime/dri/mysql"
"code.hoteas.com/hoteas/hotime/tools/db"
"fmt"
"strings"
//"go.hoteas.com/hotime/cache"
"golang.org/x/net/websocket"
"time"
@ -32,8 +31,10 @@ func main() {
//ca.Cache("xyzo","dasdas")
//ca.Cache("xyz*",nil)
//fmt.Println(ca.Cache("xyzm").Data)
mysql.SetDB(&appIns)
//mysql
//mysql.SetDB(&appIns)
//自动选择数据库
db.SetDB(&appIns)
//appIns.SetConnectDB(func(err ...*hotime.Error) *sql.DB {
// query := appIns.Config.GetString("dbUser") + ":" + appIns.Config.GetString("dbPwd") +

13
func.go
View File

@ -7,9 +7,6 @@ import (
"strings"
)
//安全锁
//func SafeMutex(tag int, f func() interface{}) interface{} {
//
@ -27,7 +24,6 @@ import (
// return res
//}
//字符串首字符大写
func StrFirstToUpper(str string) string {
if len(str) == 0 {
@ -119,10 +115,10 @@ func Rand(count int) int {
return ObjToInt(res)
}
func Random() float64 {
v:=float64(0);
m:=float64(0.1);
v := float64(0)
m := float64(0.1)
for i := 0; i < 15; i++ {
facter:=map[int]int{4:1,9:1,2:1,3:1,1:1,7:1,0:1,5:1,6:1,8:1,}
facter := map[int]int{4: 1, 9: 1, 2: 1, 3: 1, 1: 1, 7: 1, 0: 1, 5: 1, 6: 1, 8: 1}
for k, _ := range facter {
v = v + float64(k)*m
@ -131,10 +127,8 @@ func Random() float64 {
m = m * 0.1
}
return v
}
//随机数范围
@ -305,4 +299,3 @@ func Round(f float64, n int) float64 {
// CacheMemIns.Init(Config["cacheConfig"].(Map)["memory"].(CacheConfg).Time)
// CacheDBIns.Init(Config["cacheConfig"].(Map)["db"].(CacheConfg).Time)
//}

4
map.go
View File

@ -46,7 +46,6 @@ func (this Map) GetInt(key string, err ...*Error) int {
}
//获取Int
func (this Map) GetInt64(key string, err ...*Error) int64 {
v := ObjToInt64((this)[key], err...)
@ -60,18 +59,21 @@ func (this Map) GetCeilInt64(key string, err ...*Error) int64 {
return v
}
//获取向上取整Int
func (this Map) GetCeilInt(key string, err ...*Error) int {
v := ObjToCeilInt((this)[key], err...)
return v
}
//获取向上取整float64
func (this Map) GetCeilFloat64(key string, err ...*Error) float64 {
v := ObjToCeilFloat64((this)[key], err...)
return v
}
//获取Float64
func (this Map) GetFloat64(key string, err ...*Error) float64 {

2
obj.go
View File

@ -67,7 +67,6 @@ func (this *Obj)ToMapArray(err ...Error)[]Map{
return ObjToMapArray(this.Data, &this.Error)
}
func (this *Obj) ToObj() interface{} {
return this.Data
@ -82,6 +81,7 @@ func (this *Obj) ToCeilInt64(err ...*Error) int64 {
return v
}
//获取向上取整Int
func (this *Obj) ToCeilInt(err ...*Error) int {
if len(err) != 0 {

4
objtoobj.go
View File

@ -3,8 +3,8 @@ package hotime
import (
"encoding/json"
"errors"
"strconv"
"math"
"strconv"
)
//仅限于hotime.Slice
@ -49,7 +49,6 @@ func ObjToMap(obj interface{}, e ...*Error) Map {
return v
}
func ObjToMapArray(obj interface{}, e ...*Error) []Map {
s := ObjToSlice(obj, e...)
res := []Map{}
@ -142,6 +141,7 @@ func ObjToFloat64(obj interface{}, e ...*Error) float64 {
return v
}
//向上取整
func ObjToCeilInt64(obj interface{}, e ...*Error) int64 {
f := ObjToCeilFloat64(obj, e...)

2
slice.go
View File

@ -33,12 +33,14 @@ func (this Slice) GetCeilInt64(key int, err ...*Error) int64 {
return v
}
//获取向上取整Int
func (this Slice) GetCeilInt(key int, err ...*Error) int {
v := ObjToCeilInt((this)[key], err...)
return v
}
//获取向上取整float64
func (this Slice) GetCeilFloat64(key int, err ...*Error) float64 {
v := ObjToCeilFloat64((this)[key], err...)

4
dri/db/auto.go → tools/db/auto.go
View File

@ -2,8 +2,8 @@ package db
import (
"code.hoteas.com/hoteas/hotime"
"code.hoteas.com/hoteas/hotime/dri/mysql"
"code.hoteas.com/hoteas/hotime/dri/sqlite"
"code.hoteas.com/hoteas/hotime/tools/mysql"
"code.hoteas.com/hoteas/hotime/tools/sqlite"
"strings"
)

0
dri/mysql/mysql.go → tools/mysql/mysql.go
View File

0
dri/sqlite/sqlite.go → tools/sqlite/sqlite.go
View File

2
type.go
View File

@ -14,10 +14,8 @@ type CacheIns interface {
Cache(key string, data ...interface{}) *Obj
}
//单条缓存数据
type cacheData struct {
time int64
data interface{}
}

52
var.go
View File

@ -1,15 +1,13 @@
package hotime
var IsRun = false //当前状态
var App = map[string]*Application{} //整个项目
//var Db = HoTimeDB{} //数据库实例
var Config = Map{
"tpt": "tpt",
"debug": 1, //debug 0关闭1开启
"logLevel": LOG_NIL,
"defFile": []string{"index.html", "index.htm"},
"dbHost": "127.0.0.1",
//"dbHost":"localhost",
"dbName": "test",
@ -17,16 +15,56 @@ var Config = Map{
"dbPwd": "root",
"dbPort": "3306",
"dbCached": 0, //0不开启缓存
"port": "0",
"cacheShortTime": 60 * 60 * 2,
"cacheLongTime": 60 * 60 * 24 * 30,
"sessionName": "HOTIME",
"error": Map{
"1":"系统错误",
"1": "内部系统异常",
"2": "访问权限异常",
"3": "请求参数异常",
"4": "数据处理异常",
"5": "数据结果异常",
},
"debug":1,//debug 0关闭1开启
"tpt": "tpt",
"defFile": []string{"index.html", "index.htm"},
"crossDomain": "", //是否开启跨域
"modeRouterStrict": false, //路由严格模式/a/b/c
"port": "0",
"sessionName": "HOTIME",
"tlsPort": "0",
"tlsKey": "",
"tlsCert": "",
}
var ConfigNote = Map{
"logLevel": "日志等级，0打印，1关闭，2，记录到文件",
"debug": "是否开启debug模式，0关闭，其他开启，debug模式下日志展示更全", //debug 0关闭1开启
"dbHost": "数据库ip地址默认127.0.0.1",
"dbName": "数据库名称，sqlite为文件路径比如a/x.db",
"dbUser": "数据库用户名",
"dbPwd": "数据库密码",
"dbPort": "数据库端口",
"dbType": "如果使用自动数据库配置，请设置此项，手动配置数据库不需要，目前支持mysql，sqlite",
"dbCached": "是否开启数据库缓存0为关闭，其他开启", //0不开启缓存
"redisHost": "需要使用redis服务时配置，默认服务ip：127.0.0.1",
"redisPort": "需要使用redis服务时配置，默认服务端口：6379",
"redisPwd": "需要使用redis服务时配置，默认服务密码：123456",
"cacheShortTime": "两级缓存，短缓存存储时间60 * 60 * 2，一般为内存缓存",
"cacheLongTime": "两级缓存，长缓存存储时间60 * 60 * 24 * 30，一般为数据库或者redis缓存",
"error": Map{
"1": "内部系统异常，在环境配置，文件访问权限等基础运行环境条件不足造成严重错误时使用",
"2": "访问权限异常，没有登录或者登录异常等时候使用",
"3": "请求参数异常，request参数不满足要求，比如参数不足，参数类型错误，参数不满足要求等时候使用",
"4": "数据处理异常,数据库操作或者三方请求返回的结果非正常结果，比如数据库突然中断等时候使用",
"5": "数据结果异常，一般用于无法给出response要求的格式要求下使用，比如response需要的是string格式但你只能提供int数据时",
"注释": "web服务内置错误提示，自定义异常建议10开始",
},
"tpt": "静态文件目录，默认为程序目录下tpt目录",
"defFile": "默认访问文件，默认访问index.html或者index.htm文件",
"crossDomain": "跨域设置，空字符串为不开启，*为开启所有网站允许跨域，http://www.baidu.com为指定域允许跨域", //是否开启跨域
"modeRouterStrict": "路由严格模式false,为大小写忽略必须匹配，true必须大小写匹配", //路由严格模式/a/b/c
"sessionName": "设置session的cookie名默认HOTIME",
"port": "web服务开启Http端口，0为不启用http服务",
"tlsPort": "web服务https端口，0为不启用https服务",
"tlsKey": "https密钥",
"tlsCert": "https证书",
}